diff options
| author | Liam <byteslice@airmail.cc> | 2022-12-22 01:27:11 +0100 |
|---|---|---|
| committer | Liam <byteslice@airmail.cc> | 2022-12-22 01:27:11 +0100 |
| commit | ae6015a69b211a98f9ef97d73b5c301c359ca35f (patch) | |
| tree | a3404e7ab91e203a4f390dd6367160e6fee775df | |
| parent | qt: continue event loop during game close (diff) | |
| download | yuzu-ae6015a69b211a98f9ef97d73b5c301c359ca35f.tar yuzu-ae6015a69b211a98f9ef97d73b5c301c359ca35f.tar.gz yuzu-ae6015a69b211a98f9ef97d73b5c301c359ca35f.tar.bz2 yuzu-ae6015a69b211a98f9ef97d73b5c301c359ca35f.tar.lz yuzu-ae6015a69b211a98f9ef97d73b5c301c359ca35f.tar.xz yuzu-ae6015a69b211a98f9ef97d73b5c301c359ca35f.tar.zst yuzu-ae6015a69b211a98f9ef97d73b5c301c359ca35f.zip | |
| -rw-r--r-- | src/yuzu/main.cpp | 5 | ||||
| -rw-r--r-- | src/yuzu/util/overlay_dialog.cpp | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 66fdbcfed..c67fb997a 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1815,9 +1815,8 @@ void GMainWindow::OnShutdownBegin() { } void GMainWindow::OnShutdownBeginDialog() { - shutdown_dialog = - new OverlayDialog(render_window, *system, QString{}, tr("Closing software..."), QString{}, - QString{}, Qt::AlignHCenter | Qt::AlignVCenter); + shutdown_dialog = new OverlayDialog(this, *system, QString{}, tr("Closing software..."), + QString{}, QString{}, Qt::AlignHCenter | Qt::AlignVCenter); shutdown_dialog->open(); } diff --git a/src/yuzu/util/overlay_dialog.cpp b/src/yuzu/util/overlay_dialog.cpp index 25fa789ac..796f5bf41 100644 --- a/src/yuzu/util/overlay_dialog.cpp +++ b/src/yuzu/util/overlay_dialog.cpp @@ -3,6 +3,7 @@ #include <QKeyEvent> #include <QScreen> +#include <QWindow> #include "core/core.h" #include "core/hid/hid_types.h" @@ -162,7 +163,7 @@ void OverlayDialog::MoveAndResizeWindow() { const auto height = static_cast<float>(parentWidget()->height()); // High DPI - const float dpi_scale = qApp->screenAt(pos)->logicalDotsPerInch() / 96.0f; + const float dpi_scale = parentWidget()->windowHandle()->screen()->logicalDotsPerInch() / 96.0f; const auto title_text_font_size = BASE_TITLE_FONT_SIZE * (height / BASE_HEIGHT) / dpi_scale; const auto body_text_font_size = |